Merge version 2.12.0-1+rpi1 and 2.12.0-2 to produce 2.12.0-2+rpi1

Merge cmus (2.12.0-2) import into refs/heads/workingbranch

ip/ffmpeg: change sample format conversions

Gbp-Pq: Name 0015-ip-ffmpeg-change-sample-format-conversions.patch

ip/ffmpeg: fix building for ffmpeg 8.0

avcodec_close() can be safely removed because avcodec_free_context()
is its replacement since 2016. See ffmpeg commit 2ef6dab0a79

Builds with v3.3.9 v4.0.6 v6.1.3 v7.1.1 v8.0

Gbp-Pq: Name 0014-ip-ffmpeg-fix-building-for-ffmpeg-8.0.patch

ip/ffmpeg: improve readability

Previously ffmpeg_read()'s while loop was kinda leaking into
ffmpeg_get_frame(), now it doesn't.

Gbp-Pq: Name 0013-ip-ffmpeg-improve-readability.patch

ip/ffmpeg: don't process empty frames

Gbp-Pq: Name 0012-ip-ffmpeg-don-t-process-empty-frames.patch

ip/ffmpeg: better frame skipping logic

Gbp-Pq: Name 0011-ip-ffmpeg-better-frame-skipping-logic.patch

ip/ffmpeg: reset swr_frame_start when seeking

Gbp-Pq: Name 0010-ip-ffmpeg-reset-swr_frame_start-when-seeking.patch

ip/ffmpeg: remember swr_frame's capacity

Gbp-Pq: Name 0009-ip-ffmpeg-remember-swr_frame-s-capacity.patch

ip/ffmpeg: flush swresample buffer when seeking

Gbp-Pq: Name 0008-ip-ffmpeg-flush-swresample-buffer-when-seeking.patch

Validate sample format in ip_open()

To prevent segfault in ip_setup() because channels=0, validate ip_data->sf
after opening ip.

Gbp-Pq: Name 0007-Validate-sample-format-in-ip_open.patch

ip/ffmpeg: major refactor

Gbp-Pq: Name 0006-ip-ffmpeg-major-refactor.patch

ip/ffmpeg: remove excessive version checks

ffmpeg download page states that v4.0.6 has
- libavutil 56.14.100
- libavcodec 58.18.100
- libavformat 58.12.100
(https://ffmpeg.org/olddownload.html)

After removing all checks for versions lower than these, the plugin
still compiles with v3.3.9 headers.

After all, why be better with compatibility than developers themselves?

Gbp-Pq: Name 0005-ip-ffmpeg-remove-excessive-version-checks.patch

ip/ffmpeg: skip samples only when needed

Gbp-Pq: Name 0004-ip-ffmpeg-skip-samples-only-when-needed.patch

ip/ffmpeg: more precise seeking

av_seek_frame() and avformat_seek_file() seek to nearest "keyframe". For
codecs like, for example, ape this means that seeking will be very off
(5 seconds or more). So what we do is:
1. seek to nearest "keyframe" before the desired time,
2. discard some frames to approach the desired time.

Gbp-Pq: Name 0003-ip-ffmpeg-more-precise-seeking.patch

Use hardening flags for Doc/ttman

Forwarded: not-needed
Last-Update: 2025-03-16

Last-Update: 2025-03-16
Gbp-Pq: Name 0002-fix-blhc.patch

Pass LDLIBS to the linker

Origin: Debian
Bug-Debian: http://bugs.debian.org/935678
Forwarded: no
Reviewed-by: Ryan Kavanagh <rak@debian.org>
Last-Update: 2019-09-07

Needed to pass -latomic at the end so that we can fix a FTBFS on various
architectures.
Last-Update: 2019-09-07

Gbp-Pq: Name 0001-atomic_ld.patch

cmus (2.12.0-2) unstable; urgency=medium

  * Team upload
  * Fix build with ffmpeg 8.0 (Closes: #1115013)

[dgit import unpatched cmus 2.12.0-2]

Import cmus_2.12.0-2.debian.tar.xz

[dgit import tarball cmus 2.12.0-2 cmus_2.12.0-2.debian.tar.xz]

Manual merge of version 2.11.0-1+rpi1 and 2.12.0-1 to produce 2.12.0-1+rpi1

Merge cmus (2.12.0-1) import into refs/heads/workingbranch

Import cmus_2.12.0.orig.tar.gz

[dgit import orig cmus_2.12.0.orig.tar.gz]

Use hardening flags for Doc/ttman

Forwarded: not-needed
Last-Update: 2025-03-16

Last-Update: 2025-03-16
Gbp-Pq: Name 0002-fix-blhc.patch

Pass LDLIBS to the linker

Origin: Debian
Bug-Debian: http://bugs.debian.org/935678
Forwarded: no
Reviewed-by: Ryan Kavanagh <rak@debian.org>
Last-Update: 2019-09-07

Needed to pass -latomic at the end so that we can fix a FTBFS on various
architectures.
Last-Update: 2019-09-07

Gbp-Pq: Name 0001-atomic_ld.patch

cmus (2.12.0-1) unstable; urgency=medium

  * Team upload.

  [ Philippe SWARTVAGHER ]
  * New upstream version 2.12.0 (Closes: #1087737)
    + Refresh patches
  * Bump standards-version to 4.7.2: no change needed
  * d/rules: remove as-needed linker flag
  * Add lintian override for library-not-linked-against-libc
    of usr/lib/cmus/op/sndio.so
  * Add patch to use hardening flags to build Doc/ttman

  [ Helmut Grohne ]
  * Fix FTCBFS: Fix build/host confusion. (Closes: #954749)

  [ Dylan Aïssi ]
  * Convert debian/copyright to DEP5

[dgit import unpatched cmus 2.12.0-1]

Import cmus_2.12.0-1.debian.tar.xz

[dgit import tarball cmus 2.12.0-1 cmus_2.12.0-1.debian.tar.xz]

Merge version 2.10.0-4+rpi1 and 2.11.0-1 to produce 2.11.0-1+rpi1

Merge cmus (2.11.0-1) import into refs/heads/workingbranch

Pass LDLIBS to the linker

Origin: Debian
Bug-Debian: http://bugs.debian.org/935678
Forwarded: no
Reviewed-by: Ryan Kavanagh <rak@debian.org>
Last-Update: 2019-09-07

Needed to pass -latomic at the end so that we can fix a FTBFS on various
architectures.
Last-Update: 2019-09-07

Gbp-Pq: Name 0001-atomic_ld.patch

cmus (2.11.0-1) unstable; urgency=medium

  * Team upload
  * New upstream version 2.11.0
    - Fix build with ffmpeg 7.0 (Closes: #1072405)
  * debian/patches: Refresh patches
  * debian/control:
    - Bump Standards-Version
    - Use pkgconf
    - Use openmpt's modplug
    - Use libncurses-dev

[dgit import unpatched cmus 2.11.0-1]

Import cmus_2.11.0.orig.tar.xz

[dgit import orig cmus_2.11.0.orig.tar.xz]

Import cmus_2.11.0-1.debian.tar.xz

[dgit import tarball cmus 2.11.0-1 cmus_2.11.0-1.debian.tar.xz]

Merge version 2.10.0-3+rpi1 and 2.10.0-4 to produce 2.10.0-4+rpi1

Merge cmus (2.10.0-4) import into refs/heads/workingbranch

Remove AV_CODEC_{CAP,FLAG}_TRUNCATED for FFmpeg 6 compatibility

Closes #1251

Gbp-Pq: Name 0005-Remove-AV_CODEC_-CAP-FLAG-_TRUNCATED-for-FFmpeg-6-co.patch

Fix freeze when exiting cmus

Origin: upstream, https://github.com/cmus/cmus/pull/1172
Bug: https://github.com/cmus/cmus/issues/1184

Gbp-Pq: Name 0004-Fix-freeze-on-exit.patch

Fix a typo spotted by Lintian

Forwarded: https://github.com/cmus/cmus/pull/1206

Gbp-Pq: Name 0003-Fix-typo.patch

Pass LDLIBS to the linker

Origin: Debian
Bug-Debian: http://bugs.debian.org/935678
Forwarded: no
Reviewed-by: Ryan Kavanagh <rak@debian.org>
Last-Update: 2019-09-07

Needed to pass -latomic at the end so that we can fix a FTBFS on various
architectures.
Last-Update: 2019-09-07
Gbp-Pq: Name 13-atomic_ld.patch

Horrible fix for misdetection of modplug.

Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=724181
Forwarded: no

Forwarded: no
Gbp-Pq: Name 11-fix_modplug_detection.patch

cmus (2.10.0-4) unstable; urgency=medium

  * Team upload
  * debian/patches: Apply upstream patch to fix compatibility with ffmpeg 6.0
    (Closes: #1041375)

[dgit import unpatched cmus 2.10.0-4]

Import cmus_2.10.0-4.debian.tar.xz

[dgit import tarball cmus 2.10.0-4 cmus_2.10.0-4.debian.tar.xz]

Merge version 2.10.0-2+rpi1 and 2.10.0-3 to produce 2.10.0-3+rpi1

Merge cmus (2.10.0-3) import into refs/heads/workingbranch

Fix freeze when exiting cmus

Origin: upstream, https://github.com/cmus/cmus/pull/1172
Bug: https://github.com/cmus/cmus/issues/1184

Gbp-Pq: Name 0004-Fix-freeze-on-exit.patch

Fix a typo spotted by Lintian

Forwarded: https://github.com/cmus/cmus/pull/1206

Gbp-Pq: Name 0003-Fix-typo.patch

Pass LDLIBS to the linker

Origin: Debian
Bug-Debian: http://bugs.debian.org/935678
Forwarded: no
Reviewed-by: Ryan Kavanagh <rak@debian.org>
Last-Update: 2019-09-07

Needed to pass -latomic at the end so that we can fix a FTBFS on various
architectures.
Last-Update: 2019-09-07
Gbp-Pq: Name 13-atomic_ld.patch

Horrible fix for misdetection of modplug.

Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=724181
Forwarded: no

Forwarded: no
Gbp-Pq: Name 11-fix_modplug_detection.patch

cmus (2.10.0-3) unstable; urgency=medium

  * Team upload
  * debian/control: Bump Standards-Version
  * debian/: Remove roar support (Closes: #1030661)

[dgit import unpatched cmus 2.10.0-3]

Import cmus_2.10.0-3.debian.tar.xz

[dgit import tarball cmus 2.10.0-3 cmus_2.10.0-3.debian.tar.xz]

Merge version 2.10.0-1+rpi1 and 2.10.0-2 to produce 2.10.0-2+rpi1

Merge cmus (2.10.0-2) import into refs/heads/workingbranch

Fix freeze when exiting cmus

Origin: upstream, https://github.com/cmus/cmus/pull/1172
Bug: https://github.com/cmus/cmus/issues/1184

Gbp-Pq: Name 0004-Fix-freeze-on-exit.patch

Fix a typo spotted by Lintian

Forwarded: https://github.com/cmus/cmus/pull/1206

Gbp-Pq: Name 0003-Fix-typo.patch

Pass LDLIBS to the linker

Origin: Debian
Bug-Debian: http://bugs.debian.org/935678
Forwarded: no
Reviewed-by: Ryan Kavanagh <rak@debian.org>
Last-Update: 2019-09-07

Needed to pass -latomic at the end so that we can fix a FTBFS on various
architectures.
Last-Update: 2019-09-07
Gbp-Pq: Name 13-atomic_ld.patch

Horrible fix for misdetection of modplug.

Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=724181
Forwarded: no

Forwarded: no
Gbp-Pq: Name 11-fix_modplug_detection.patch

cmus (2.10.0-2) unstable; urgency=medium

  * Team upload
  * Add a patch from upstream to fix a freeze when exiting cmus

[dgit import unpatched cmus 2.10.0-2]

Import cmus_2.10.0-2.debian.tar.xz

[dgit import tarball cmus 2.10.0-2 cmus_2.10.0-2.debian.tar.xz]

Merge version 2.9.1-1+rpi1 and 2.10.0-1 to produce 2.10.0-1+rpi1

Import cmus_2.10.0.orig.tar.gz

[dgit import orig cmus_2.10.0.orig.tar.gz]

Merge cmus (2.10.0-1) import into refs/heads/workingbranch

Fix a typo spotted by Lintian

Forwarded: https://github.com/cmus/cmus/pull/1206

Gbp-Pq: Name 0003-Fix-typo.patch

Pass LDLIBS to the linker

Origin: Debian
Bug-Debian: http://bugs.debian.org/935678
Forwarded: no
Reviewed-by: Ryan Kavanagh <rak@debian.org>
Last-Update: 2019-09-07

Needed to pass -latomic at the end so that we can fix a FTBFS on various
architectures.
Last-Update: 2019-09-07
Gbp-Pq: Name 13-atomic_ld.patch

Horrible fix for misdetection of modplug.

Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=724181
Forwarded: no

Forwarded: no
Gbp-Pq: Name 11-fix_modplug_detection.patch

cmus (2.10.0-1) unstable; urgency=medium

  * Team upload

  [ Jenkins ]
  * Remove constraints unnecessary since buster

  [ Philippe SWARTVAGHER ]
  * New upstream version 2.10.0
  * Bump d/watch version
  * Bump standards-version to 4.6.1
  * Add a patch to fix a typo spotted by Lintian

[dgit import unpatched cmus 2.10.0-1]

Import cmus_2.10.0-1.debian.tar.xz

[dgit import tarball cmus 2.10.0-1 cmus_2.10.0-1.debian.tar.xz]

Merge version 2.8.0-2+rpi1 and 2.9.1-1 to produce 2.9.1-1+rpi1

Merge cmus (2.9.1-1) import into refs/heads/workingbranch

Pass LDLIBS to the linker

Origin: Debian
Bug-Debian: http://bugs.debian.org/935678
Forwarded: no
Reviewed-by: Ryan Kavanagh <rak@debian.org>
Last-Update: 2019-09-07

Needed to pass -latomic at the end so that we can fix a FTBFS on various
architectures.
Last-Update: 2019-09-07
Gbp-Pq: Name 13-atomic_ld.patch

Horrible fix for misdetection of modplug.

Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=724181
Forwarded: no

Forwarded: no
Gbp-Pq: Name 11-fix_modplug_detection.patch

cmus (2.9.1-1) unstable; urgency=medium

  * Team upload
  * New upstream release

[dgit import unpatched cmus 2.9.1-1]

Import cmus_2.9.1.orig.tar.gz

[dgit import orig cmus_2.9.1.orig.tar.gz]

Import cmus_2.9.1-1.debian.tar.xz

[dgit import tarball cmus 2.9.1-1 cmus_2.9.1-1.debian.tar.xz]

Merge cmus (2.8.0-2+rpi1) import into refs/heads/workingbranch

Pass LDLIBS to the linker

Origin: Debian
Bug-Debian: http://bugs.debian.org/935678
Forwarded: no
Reviewed-by: Ryan Kavanagh <rak@debian.org>
Last-Update: 2019-09-07

Needed to pass -latomic at the end so that we can fix a FTBFS on various
architectures.
Last-Update: 2019-09-07
Gbp-Pq: Name 13-atomic_ld.patch

Fix spelling mistakes

Forwarded: no

Forwarded: no
Gbp-Pq: Name 12-typos.patch

Horrible fix for misdetection of modplug.

Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=724181
Forwarded: no

Forwarded: no
Gbp-Pq: Name 11-fix_modplug_detection.patch

cmus (2.8.0-2+rpi1) bullseye-staging; urgency=medium

  * Add armhf to list of libatomic architectures.

[dgit import unpatched cmus 2.8.0-2+rpi1]

Import cmus_2.8.0-2+rpi1.debian.tar.xz

[dgit import tarball cmus 2.8.0-2+rpi1 cmus_2.8.0-2+rpi1.debian.tar.xz]

Merge cmus (2.8.0-2) import into refs/heads/workingbranch

Pass LDLIBS to the linker

Origin: Debian
Bug-Debian: http://bugs.debian.org/935678
Forwarded: no
Reviewed-by: Ryan Kavanagh <rak@debian.org>
Last-Update: 2019-09-07

Needed to pass -latomic at the end so that we can fix a FTBFS on various
architectures.
Last-Update: 2019-09-07
Gbp-Pq: Name 13-atomic_ld.patch

Fix spelling mistakes

Forwarded: no

Forwarded: no
Gbp-Pq: Name 12-typos.patch

Horrible fix for misdetection of modplug.

Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=724181
Forwarded: no

Forwarded: no
Gbp-Pq: Name 11-fix_modplug_detection.patch

cmus (2.8.0-2) unstable; urgency=medium

  * Set build flags via /usr/share/dpkg/buildflags.mk
  * Link with -latomic to fix FTBFS on various architectures (Closes: #935678)

[dgit import unpatched cmus 2.8.0-2]

Import cmus_2.8.0-2.debian.tar.xz

[dgit import tarball cmus 2.8.0-2 cmus_2.8.0-2.debian.tar.xz]

Import cmus_2.8.0.orig.tar.gz

[dgit import orig cmus_2.8.0.orig.tar.gz]

Merge cmus (2.7.1+git20160225-2) import into refs/heads/workingbranch

Fix FTBFS with FFmpeg 4.0

Origin: backport, https://github.com/cmus/cmus/pull/793
Bug-Debian: https://bugs.debian.org/888384

Bug-Debian: https://bugs.debian.org/888384
Gbp-Pq: Name 12-ffmpeg-4.0.patch

Horrible fix for misdetection of modplug.

Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=724181
Forwarded: no

Forwarded: no
Gbp-Pq: Name 11-fix_modplug_detection.patch

cmus (2.7.1+git20160225-2) unstable; urgency=medium

  * Team upload.

  [ James Cowgill ]
  * Add upstream patch to fix FTBFS with FFmpeg 4.0. (Closes: #888384)
  * d/changelog: Remove trailing blank line.

  [ Alessio Treglia ]
  * Remove myself from the Uploaders field.

  [ Ondřej Nový ]
  * d/control: Set Vcs-* to salsa.debian.org.
  * d/changelog: Remove trailing whitespaces.

  [ Felipe Sateler ]
  * Change maintainer address to debian-multimedia@lists.debian.org.

[dgit import unpatched cmus 2.7.1+git20160225-2]

Import cmus_2.7.1+git20160225-2.debian.tar.xz

[dgit import tarball cmus 2.7.1+git20160225-2 cmus_2.7.1+git20160225-2.debian.tar.xz]

Merge cmus (2.7.1+git20160225-1) import into refs/heads/workingbranch

Import cmus_2.7.1+git20160225.orig.tar.xz

[dgit import orig cmus_2.7.1+git20160225.orig.tar.xz]

Horrible fix for misdetection of modplug.

Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=724181
Forwarded: no

Forwarded: no
Gbp-Pq: Name 11-fix_modplug_detection.patch

cmus (2.7.1+git20160225-1) unstable; urgency=medium

  * Team upload.
  * New upstream snapshot.
    - Fix build against ffmpeg 3.0. (Closes: #810557)
  * debian/patches/{01_config.mk.diff,02_link_avcodec.patch}: Removed, applied
    upstream.
  * debian/control:
    - Bump Standards Version.
    - Update Vcs-Git.

[dgit import unpatched cmus 2.7.1+git20160225-1]

Import cmus_2.7.1+git20160225-1.debian.tar.xz

[dgit import tarball cmus 2.7.1+git20160225-1 cmus_2.7.1+git20160225-1.debian.tar.xz]

Re: FTBFS with libav10

Gbp-Pq: Name libav10.patch

Horrible fix for misdetection of modplug.

Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=724181
Forwarded: no

Forwarded: no
Gbp-Pq: Name 11-fix_modplug_detection.patch

Use CPPFLAGS to enable function fortification / hardening

Origin: vendor
Forwarded: yes
Applied-Upstream: https://github.com/cmus/cmus/commit/543ae8e

Based off of GNU Make's implicit rule
Applied-Upstream: https://github.com/cmus/cmus/commit/543ae8e
Gbp-Pq: Name 03_cppflags.diff

Fix typo in binary

Origin: vendor
Forwarded: yes
Applied-Upstream: https://github.com/cmus/cmus/commit/f0eb35d

Applied-Upstream: https://github.com/cmus/cmus/commit/f0eb35d
Gbp-Pq: Name 02_fix_typo.diff

Don't FTBFS if config.mk doesn't exist

Origin: vendor
Bug-Debian: http://bugs.debian.org/720781
Forwarded: no

The config.mk file isn't guaranteed to exist (it gets removed by the Makefile's
"distclean" target). Including it with a straight "include" causes cmus to
FTBFS on the initial clean, since it doesn't exist and make aborts because it
can't include it. Instead, include it using "-include", which ignores it if it
doesn't exist.
Forwarded: no
Gbp-Pq: Name 01_config.mk.diff